From 283b2fa4e8bedc649bfb2549f7233c6dd12e3d23 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Mon, 27 Nov 2006 14:48:38 +0000 Subject: [PATCH] Don't send the old state string for halted domains -- it doesn't make any sense, and we don't want to see state flags linger. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/XendConfig.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index ad5e0ad4a3..da7898c72c 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -685,15 +685,15 @@ class XendConfig(dict): # TODO: domid/dom is the same thing but called differently # depending if it is from xenstore or sxpr. - if domain.getDomid() != None: + if domain.getDomid() is not None: sxpr.append(['domid', domain.getDomid()]) for cfg, typefunc in ROUNDTRIPPING_CONFIG_ENTRIES: if cfg in self: - if self[cfg] != None: + if self[cfg] is not None: sxpr.append([cfg, self[cfg]]) - if 'image' in self and self['image'] != None: + if 'image' in self and self['image'] is not None: sxpr.append(['image', self['image']]) if 'security' in self and self['security']: sxpr.append(['security', self['security']]) @@ -714,7 +714,9 @@ class XendConfig(dict): else: sxpr.append(['status', str(DOM_STATE_HALTED)]) - sxpr.append(['state', self._get_old_state_string()]) + if domain.getDomid() is not None: + sxpr.append(['state', self._get_old_state_string()]) + sxpr.append(['memory_dynamic_max', self.get('memory_dynamic_max', self['memory'])]) -- 2.30.2